Merge tag 'upstream/2017.3' into debian/master
authorSimon McVittie <smcv@debian.org>
Fri, 10 Mar 2017 23:16:42 +0000 (23:16 +0000)
committerSimon McVittie <smcv@debian.org>
Fri, 10 Mar 2017 23:16:42 +0000 (23:16 +0000)
Upstream version 2017.3


Trivial merge